chain finalize to parent class to get removed from the toplevel_list.

2001-11-03  Hans Breuer  <hans@breuer.org>

	* gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain
	finalize to parent class to get removed from the toplevel_list.
	Should fix 'random' crashes of #63474.

	* gtk/gtktreemodelsort.c : chain finalize() to parent class

diff --git a/ChangeLog b/ChangeLog
index dfedd018179130ff78d73d54f85859556885632e..4c39f247077288c68385aacd9a8e012d1dadbe6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain
+       finalize to parent class to get removed from the toplevel_list.
+       Should fix 'random' crashes of #63474.
+
+       * gtk/gtktreemodelsort.c : chain finalize() to parent class
+
 2001-11-03  Tor Lillqvist  <tml@iki.fi>
 
        * modules/input/Makefile.am: Use -no-undefined on Windows. Look

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index dfedd018179130ff78d73d54f85859556885632e..4c39f247077288c68385aacd9a8e012d1dadbe6f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain
+       finalize to parent class to get removed from the toplevel_list.
+       Should fix 'random' crashes of #63474.
+
+       * gtk/gtktreemodelsort.c : chain finalize() to parent class
+
 2001-11-03  Tor Lillqvist  <tml@iki.fi>
 
        * modules/input/Makefile.am: Use -no-undefined on Windows. Look

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dfedd018179130ff78d73d54f85859556885632e..4c39f247077288c68385aacd9a8e012d1dadbe6f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain
+       finalize to parent class to get removed from the toplevel_list.
+       Should fix 'random' crashes of #63474.
+
+       * gtk/gtktreemodelsort.c : chain finalize() to parent class
+
 2001-11-03  Tor Lillqvist  <tml@iki.fi>
 
        * modules/input/Makefile.am: Use -no-undefined on Windows. Look

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index dfedd018179130ff78d73d54f85859556885632e..4c39f247077288c68385aacd9a8e012d1dadbe6f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain
+       finalize to parent class to get removed from the toplevel_list.
+       Should fix 'random' crashes of #63474.
+
+       * gtk/gtktreemodelsort.c : chain finalize() to parent class
+
 2001-11-03  Tor Lillqvist  <tml@iki.fi>
 
        * modules/input/Makefile.am: Use -no-undefined on Windows. Look

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index dfedd018179130ff78d73d54f85859556885632e..4c39f247077288c68385aacd9a8e012d1dadbe6f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain
+       finalize to parent class to get removed from the toplevel_list.
+       Should fix 'random' crashes of #63474.
+
+       * gtk/gtktreemodelsort.c : chain finalize() to parent class
+
 2001-11-03  Tor Lillqvist  <tml@iki.fi>
 
        * modules/input/Makefile.am: Use -no-undefined on Windows. Look

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index dfedd018179130ff78d73d54f85859556885632e..4c39f247077288c68385aacd9a8e012d1dadbe6f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain
+       finalize to parent class to get removed from the toplevel_list.
+       Should fix 'random' crashes of #63474.
+
+       * gtk/gtktreemodelsort.c : chain finalize() to parent class
+
 2001-11-03  Tor Lillqvist  <tml@iki.fi>
 
        * modules/input/Makefile.am: Use -no-undefined on Windows. Look

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index dfedd018179130ff78d73d54f85859556885632e..4c39f247077288c68385aacd9a8e012d1dadbe6f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2001-11-03  Hans Breuer  <hans@breuer.org>
+
+       * gtk/gtkfilesel.c (gtk_file_selection_finalize) : chain
+       finalize to parent class to get removed from the toplevel_list.
+       Should fix 'random' crashes of #63474.
+
+       * gtk/gtktreemodelsort.c : chain finalize() to parent class
+
 2001-11-03  Tor Lillqvist  <tml@iki.fi>
 
        * modules/input/Makefile.am: Use -no-undefined on Windows. Look

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 554e3068ede58c17996548b3263768059e6eea45..fc8bab72544938b01cbf39c2f353ea4437a223eb 100644 (file)
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -1168,6 +1168,8 @@ gtk_file_selection_finalize (GObject *object)
   GtkFileSelection *filesel = GTK_FILE_SELECTION (object);
 
   g_free (filesel->fileop_file);
+
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 /* Begin file operations callbacks */

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 565b15100b41fc0df6e8d15c1d21029a489df7a8..cb1097e0c85246c54d95ee843f9e2a4d72c540ab 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -214,6 +214,7 @@ static GtkTreePath *gtk_real_tree_model_sort_convert_child_path_to_path (GtkTree
                                                                         GtkTreePath      *child_path,
                                                                         gboolean          build_levels);
 
+static GObjectClass *parent_class = NULL;
 
 GType
 gtk_tree_model_sort_get_type (void)
@@ -280,6 +281,7 @@ gtk_tree_model_sort_class_init (GtkTreeModelSortClass *class)
   GObjectClass *object_class;
 
   object_class = (GObjectClass *) class;
+  parent_class = g_type_class_peek_parent (class);
 
   object_class->finalize = gtk_tree_model_sort_finalize;
 }
@@ -351,6 +353,9 @@ gtk_tree_model_sort_finalize (GObject *object)
       _gtk_tree_data_list_header_free (tree_model_sort->sort_list);
       tree_model_sort->sort_list = NULL;
     }
+
+  /* must chain up */
+  parent_class->finalize (object);
 }
 
 static void